Reset current_width and current_height to 0 when ending the embedding.

Sat Jul  3 02:09:51 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width
	and current_height to 0 when ending the embedding.  (#143675,
	Nickolay V. Shmyrev)

diff --git a/ChangeLog b/ChangeLog
index b3c8c6fe1d1cc2b77fdce217f66f2e90e962a930..f39afb49df4436d16421b55a2852a274d819ad5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul  3 02:09:51 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width
+       and current_height to 0 when ending the embedding.  (#143675,
+       Nickolay V. Shmyrev)
+
 Sat Jul  3 01:48:19 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b3c8c6fe1d1cc2b77fdce217f66f2e90e962a930..f39afb49df4436d16421b55a2852a274d819ad5c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jul  3 02:09:51 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width
+       and current_height to 0 when ending the embedding.  (#143675,
+       Nickolay V. Shmyrev)
+
 Sat Jul  3 01:48:19 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b3c8c6fe1d1cc2b77fdce217f66f2e90e962a930..f39afb49df4436d16421b55a2852a274d819ad5c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jul  3 02:09:51 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width
+       and current_height to 0 when ending the embedding.  (#143675,
+       Nickolay V. Shmyrev)
+
 Sat Jul  3 01:48:19 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b3c8c6fe1d1cc2b77fdce217f66f2e90e962a930..f39afb49df4436d16421b55a2852a274d819ad5c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jul  3 02:09:51 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksocket.c (gtk_socket_end_embedding): Reset current_width
+       and current_height to 0 when ending the embedding.  (#143675,
+       Nickolay V. Shmyrev)
+
 Sat Jul  3 01:48:19 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.c (gtk_entry_move_visually): Let the cursor move

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index ebeaeb99c5bf2a6896a856eedb8dc041b015cb3e..edc06c3005d459b407f2b7f0eea6c3d79022d15f 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -401,6 +401,8 @@ gtk_socket_end_embedding (GtkSocket *socket)
 
   g_object_unref (socket->plug_window);
   socket->plug_window = NULL;
+  socket->current_width = 0;
+  socket->current_height = 0;
   private->resize_count = 0;
 
   /* Remove from end to avoid indexes shifting. This is evil */